Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jest Website v2 #11149

Merged
merged 12 commits into from
Mar 11, 2021
Merged

Jest Website v2 #11149

merged 12 commits into from
Mar 11, 2021

Conversation

slorber
Copy link
Contributor

@slorber slorber commented Mar 3, 2021

Summary

@SimenB I thought it was a good idea to have a PR merging the jest-website-v2 to master.

This way we can check if there are conflicts to resolve

Test plan

preview

@slorber
Copy link
Contributor Author

slorber commented Mar 3, 2021

Note, the current Configuration.md conflicts should be resolved after you merge #11148

@netlify
Copy link

netlify bot commented Mar 3, 2021 •
edited
Loading

Deploy preview for jestjs ready!

Built with commit 104fafd

https://deploy-preview-11149--jestjs.netlify.app

@slorber @SimenB
@jeysal @NullDivision @micaelmbagira
Upgrade jest-website-v2 branch (#11148)
94dd2eb 
Co-authored-by: Simen Bekkhus <sbekkhus91@gmail.com>
Co-authored-by: Tim Seckinger <seckinger.tim@gmail.com>
Co-authored-by: Tobias Elod-Zoltan <1067221+NullDivision@users.noreply.github.com>
Co-authored-by: Micaël Mbagira <micaelmbagira@users.noreply.github.com>
@ElianCordoba
Copy link

Smol detail, the nytimes logo is not very visible in dark mode, I can create an issues if you want me to
Screen Shot 2021-03-05 at 14 28 58

@codecov-io
Copy link

codecov-io commented Mar 9, 2021 •
edited
Loading

Codecov Report

Merging #11149 (104fafd) into master (b1764ef) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #11149      +/-   ##
==========================================
+ Coverage   64.14%   64.15%   +0.01%     
==========================================
  Files         307      307              
  Lines       13373    13373              
  Branches     3259     3259              
==========================================
+ Hits         8578     8580       +2     
+ Misses       4089     4088       -1     
+ Partials      706      705       -1
Impacted Files Coverage Δ
packages/expect/src/utils.ts 96.12% <0.00%> (+1.29%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b1764ef...104fafd. Read the comment docs.

@SimenB
Copy link
Member

SimenB commented Mar 9, 2021

seems like #11148 just made conflicts worse 😅 at least the squash merge I did. maybe just rebase this branch?

If it does not create conflicts I can probably do that before merging

@slorber slorber mentioned this pull request Mar 11, 2021
Merged
@SimenB
Copy link
Member

SimenB commented Mar 11, 2021 •
edited
Loading

Smol detail, the nytimes logo is not very visible in dark mode, I can create an issues if you want me to
Screen Shot 2021-03-05 at 14 28 58

Could you open up a separate issue, please? 🙂 I'll be merging this later today and it would be great to not forget to fix.

EDIT: never mind: #11183

@slorber slorber marked this pull request as ready for review March 11, 2021 16:14
SimenB
SimenB approved these changes Mar 11, 2021
View reviewed changes
Copy link
Member

@SimenB SimenB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's go 👍

@SimenB SimenB changed the title Jest Website v2: final PR Jest Website v2 Mar 11, 2021
@SimenB SimenB merged commit f73d5f6 into master Mar 11, 2021
@SimenB SimenB deleted the jest-website-v2 branch March 12, 2021 13:51
@github-actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
Please note this issue tracker is not a help forum. We recommend using StackOverflow or our discord channel for questions.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 10, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@SimenB SimenB SimenB approved these changes

Assignees
No one assigned
Labels
cla signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@slorber @ElianCordoba @codecov-io @SimenB @facebook-github-bot